Thursday, May 10, 2007

Resolving conflicts in Git (our way!)

Disclaimer: This is by no means a prescription of how to do this
properly. If you know how to resolve conflicts PROPERLY please please
comment now.

Owie and I were at the office today and I saw that I had a conflict to
resolve when I did an update.

So. Here's what we did:
1. Opened the file with the conflict. The filename (including the
path) was shown by git.
2. Edited the blasted file. Rawr. Didn't take so long.
3. (Now beginneth the tricky part.) MERGE IT! We didn't know how. So
basically did a git add after editing the file.
4. Then a git commit was done in order to add the file into local repo.
Normal option: git commit (then you will go to vi and you must type
your comments)
Other option (safer for non-vi users like me): git commit -m "<insert
your comments here>"
5. We pushed it back via git-svn dcommit.

Right now, this is our method. Feel free to correct us. We just needed
something that works.


ealden said...

I think you need update-index. Check it out: git help update-index

TOGoS said...

Ack! I've been deleting my checked out repository and starting over whenever I get a merge conflict. All I had to do was 'git add <conflicted file replaced with the version you want>'. Never again will git give me this headache.


Gabe said...

Oh nice, thanks for this.


Blog Archive

The Learner

My photo

a crafty cat who loves food, linux, anime and crafting.

business analyst by day, blogger by night. also a frustrated artist.