[Bug 628181] Conflicts in /home/admin/bin

["sysadmin" (bugzilla.gnome.org) <bugzilla gnome org>]

https://bugzilla.gnome.org/show_bug.cgi?id=628181
  sysadmin | Other | unspecified

Owen Taylor <otaylor> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |otaylor redhat com

--- Comment #1 from Owen Taylor <otaylor redhat com> 2010-08-28 13:27:50 UTC ---
This seems to be a local conflict on your machine - I don't see it either in
the repository or in /home/admin/bin. 

What the conflict shows is that you made the change:

++=======
+         # Create the backup directory if it doesn't exist
+         os.makedirs(os.path.dirname(outfilename))
++>>>>>>> Create the mysql backup directory before opening the file in

and committed it locally but didn't push. Then when you pulled/rebased you got
a conflict.

Since you have a conflict, your git repository is most likely still in the
middle of the rebase.

(See the "git branches in shell prompt" tip in http://live.gnome.org/Git/Tips
for something that helps a lot there.)

To keep it simple, here's what I'd suggest. 

 1) copy your changes to create-auth to a safe place
 2) git rebase --abort      # get rid of the existing rebase, if I'm guessing
your state right
 3) git log origin/master.. # see what changes you have locally that aren't
upstream
 [ If you don't want any of those changes and just want to throw them away ]
 4) git reset --hard origin/master
 [ If you do want some of those changes, then git git rebase origin/master and
follow git docs for resolving conflicts ]
 5) copy your create-auth back
 6) git diff
 [ read the diff to make sure that copying your local copy back isn't
overwriting something that was done upstream ]
 7) proceed

-- 
Configure bugmail: https://bugzilla.gnome.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the QA contact of the bug.
You are watching the assignee of the bug.