Click here to Skip to main content

Welcome to the Lounge

   

For lazing about and discussing anything in a software developer's life that takes your fancy.
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 and please don't post ads.

Technical discussions are welcome, but if you need specific help please use the programming forums.


 
GeneralRe: Change of career PinsubeditorWalt Fair, Jr.19-Nov-12 16:52 
GeneralMessage Removed Pinmemberdevvvy19-Nov-12 17:58 
AnswerRe: Change of career PinmemberSuper Lloyd19-Nov-12 18:00 
GeneralRe: Change of career Pinmemberdevvvy19-Nov-12 18:02 
GeneralRe: Change of career PinmemberSuper Lloyd19-Nov-12 18:04 
GeneralRe: Change of career Pinmembergrralph119-Nov-12 20:57 
GeneralRe: Change of career Pinmemberdevvvy19-Nov-12 21:02 
GeneralRe: Change of career Pinmembergrralph120-Nov-12 0:33 
GeneralRe: Change of career PinmemberMember 205300619-Nov-12 21:42 
GeneralRe: Change of career PinmemberRage19-Nov-12 22:19 
GeneralRe: Change of career Pinmember_Maxxx_19-Nov-12 23:51 
GeneralRe: Change of career PinmemberRage19-Nov-12 22:22 
GeneralRe: Change of career PinmemberBobJanova19-Nov-12 23:26 
RantSo the rebase fails Pinmemberloctrice19-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 PinmemberPeter_in_278019-Nov-12 14:54 
GeneralRe: So the rebase fails Pinmemberwizardzz20-Nov-12 4:23 
GeneralRe: So the rebase fails Pinmemberloctrice20-Nov-12 6:43 
GeneralRe: So the rebase fails Pinmemberwizardzz20-Nov-12 6:49 
GeneralFruity Wine PinmemberMycroft Holmes19-Nov-12 13:43 
GeneralRe: Fruity Wine Pinmemberdevvvy19-Nov-12 13:57 
GeneralRe: Fruity Wine Pinmember_Maxxx_19-Nov-12 15:17 
GeneralRe: Fruity Wine PinmemberMycroft Holmes19-Nov-12 15:32 
GeneralRe: Fruity Wine PinmemberNeverJustHere19-Nov-12 15:36 
GeneralRe: Fruity Wine PinmemberMycroft Holmes19-Nov-12 15:47 
GeneralRe: Fruity Wine PinmemberNeverJustHere19-Nov-12 15:57 
GeneralRe: Fruity Wine Pinmembergrralph119-Nov-12 20:09 
GeneralRe: Fruity Wine PinmemberNeverJustHere19-Nov-12 23:21 
GeneralRe: Fruity Wine Pinmembergrralph120-Nov-12 0:11 
GeneralRe: Fruity Wine PinmemberMike-MadBadger19-Nov-12 19:56 
GeneralRe: Fruity Wine PinmemberMycroft Holmes19-Nov-12 21:12 
GeneralRe: Fruity Wine PinmemberNagy Vilmos19-Nov-12 22:09 
GeneralRe: Fruity Wine PinmemberMike-MadBadger20-Nov-12 8:07 
GeneralRe: Fruity Wine PinmemberHaakon S.19-Nov-12 20:02 
GeneralRe: Fruity Wine PinmemberGuirec Le Bars19-Nov-12 21:15 
GeneralRe: Fruity Wine PinmemberMycroft Holmes19-Nov-12 21:16 
GeneralRe: Fruity Wine PinmemberMike-MadBadger20-Nov-12 8:12 
GeneralRe: Fruity Wine PinmemberMycroft Holmes20-Nov-12 11:37 
GeneralRe: Fruity Wine PinmemberMike-MadBadger20-Nov-12 19:46 
GeneralDrinkin' Survey PinmemberMarco Bertschi19-Nov-12 23:11 
GeneralRe: Fruity Wine PinmemberSlacker00720-Nov-12 4:57 
GeneralRe: Fruity Wine PinmemberMehGerbil21-Nov-12 9:47 
GeneralBlind Guardian - At The Edge of Time PinmvpEspen Harlinn19-Nov-12 10:14 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpChristian Graus19-Nov-12 10:23 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpEspen Harlinn19-Nov-12 10:27 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpChristian Graus19-Nov-12 10:29 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpEspen Harlinn19-Nov-12 10:34 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpChristian Graus19-Nov-12 10:38 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpEspen Harlinn19-Nov-12 10:43 
GeneralRe: Blind Guardian - At The Edge of Time PinmvpChristian Graus19-Nov-12 10:45 
GeneralRe: Blind Guardian - At The Edge of Time PinprotectorPete O'Hanlon19-Nov-12 10:42 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    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
Web04 | 2.8.140916.1 | Last Updated 19 Sep 2014
Copyright © CodeProject, 1999-2014
All Rights Reserved. Terms of Service
Layout: fixed | fluid