Click here to Skip to main content
12,882,493 members (28,092 online)

Welcome to the Lounge


For discussing anything related to a software developer's life. Technical discussions are encouraged, but click here to ask your programming questions.

The Lounge is rated PG. If you're about to post something you wouldn't want your kid sister to read then don't post it. No flame wars, no abusive conduct, no programming questions and please don't post ads.
RantSo the rebase fails Pin
loctrice19-Nov-12 14:41
memberloctrice19-Nov-12 14:41 
I'm working on one of my first team projects. Things are going well, and we are in the second sprint. So I got switched to git for easier code reviews, and other cool workflow things.

The first merge wasn't so bad, but then someone (or the boss) was working on a stored procedure that runs the report that I was working on. By 'working on the stored procedure' we mean changing it to c# code in the controller that I'm working with. I didn't realize that until the rebase/merge happened. Not as fun as the first one. "Optimizing the report" should have alerted me that people would touch the same files I was touching..... right?....

Now I see a checkin for a shared library change. Need to get latest. Pull down code, merge conflict. WTE? How is that affecting me... Oh, the views for all 4 of my pages have been changed. We renamed files for a new navigation convention. Cool. Except that I was styling all those forms, so the merge is nassy. Git thinks a rename is a delete/add, and merge doesn't like that much of a file change. Excellent. Again files that are assigned to me for the item I'm working on are changing. Great.

Fine , whatever. I will just redo it. Most of what I did was divs anyway, a ton of field renaming. No biggy. Rebase again, another collision. I finally get it all worked out. Running the app after making a bunch of styling changes again... none of my changes are applying.
WTE?! So I make stupid obvious changes, and see they aren't showing up.

So finally I navigate to the folder and make sure the old files were dropped. They are still there. Ok, no biggy. I delete one of them and now run the app. Now it has to go to the right file right? CRASH. The routing wasn't fixed for my stuff. The files were renamed to match the convention , but the navigation is broken... unfortunately I redid the entire rebase and cherry picked my changes back on top to verify before I figured that out.

So after a few hours I have the merge done... even though there shouldn't have been any issue with my files. Now I have to wait for another checkin so that the routing is fixed and I can go on.

But hey, bad things happen right? At least I didnt actually shut my hand in the door, or perform any violent acts.
If it moves, compile it

GeneralRe: So the rebase fails Pin
Peter_in_278019-Nov-12 14:54
memberPeter_in_278019-Nov-12 14:54 
GeneralRe: So the rebase fails Pin
wizardzz20-Nov-12 4:23
memberwizardzz20-Nov-12 4:23 
GeneralRe: So the rebase fails Pin
loctrice20-Nov-12 6:43
memberloctrice20-Nov-12 6:43 
GeneralRe: So the rebase fails Pin
wizardzz20-Nov-12 6:49
memberwizardzz20-Nov-12 6:49 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.

Advertise | Privacy | Mobile
Web02 | 2.8.170422.1 | Last Updated 23 Apr 2017
Copyright © CodeProject, 1999-2017
All Rights Reserved. Terms of Service
Layout: fixed | fluid