Click here to Skip to main content
15,888,454 members

Welcome to the Lounge

   

For discussing anything related to a software developer's life but is not for programming questions. Got a programming question?

The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.

 
GeneralRe: I don't think I understand Github Pin
Jon McKee20-Mar-20 12:23
professionalJon McKee20-Mar-20 12:23 
GeneralRe: I don't think I understand Github Pin
honey the codewitch19-Mar-20 14:14
mvahoney the codewitch19-Mar-20 14:14 
GeneralRe: I don't think I understand Github Pin
Greg Utas19-Mar-20 15:09
professionalGreg Utas19-Mar-20 15:09 
GeneralRe: I don't think I understand Github Pin
honey the codewitch19-Mar-20 15:15
mvahoney the codewitch19-Mar-20 15:15 
GeneralRe: I don't think I understand Github Pin
Greg Utas19-Mar-20 15:23
professionalGreg Utas19-Mar-20 15:23 
GeneralRe: I don't think I understand Github Pin
honey the codewitch19-Mar-20 16:32
mvahoney the codewitch19-Mar-20 16:32 
GeneralRe: I don't think I understand Github Pin
Greg Utas20-Mar-20 1:06
professionalGreg Utas20-Mar-20 1:06 
GeneralRe: I don't think I understand Github Pin
Jon McKee19-Mar-20 19:05
professionalJon McKee19-Mar-20 19:05 
You can fix this to varying degrees pretty easily on the command line:
If the branch is newly created or no conflicts are expected:
git merge master
You can also use this and just manually resolve conflicts if you really want.

If conflicts are expected and you know you want to keep your changes:
git merge -s ours master

If you've been working on something but haven't committed before realizing the problem:
git stash && git merge master && git stash pop

If you want a clean history without the additional master merge:
git rebase master

Thumbs Up | :thumbsup: Big Grin | :-D

modified 20-Mar-20 1:30am.

GeneralRe: I don't think I understand Github Pin
pkfox19-Mar-20 21:47
professionalpkfox19-Mar-20 21:47 
GeneralRe: I don't think I understand Github Pin
virang_2119-Mar-20 19:05
virang_2119-Mar-20 19:05 
GeneralSo, what IS the speed of an unladen swallow? Pin
Jörgen Andersson19-Mar-20 10:13
professionalJörgen Andersson19-Mar-20 10:13 
GeneralRe: So, what IS the speed of an unladen swallow? Pin
Kent Sharkey19-Mar-20 10:33
staffKent Sharkey19-Mar-20 10:33 
GeneralRe: So, what IS the speed of an unladen swallow? Pin
Super Lloyd19-Mar-20 18:50
Super Lloyd19-Mar-20 18:50 
QuestionAnyone here used CUDA? Pin
Chris Maunder19-Mar-20 8:14
cofounderChris Maunder19-Mar-20 8:14 
AnswerRe: Anyone here used CUDA? Pin
honey the codewitch19-Mar-20 8:27
mvahoney the codewitch19-Mar-20 8:27 
GeneralRe: Anyone here used CUDA? Pin
Chris Maunder19-Mar-20 9:27
cofounderChris Maunder19-Mar-20 9:27 
GeneralRe: Anyone here used CUDA? Pin
honey the codewitch19-Mar-20 11:48
mvahoney the codewitch19-Mar-20 11:48 
GeneralRe: Anyone here used CUDA? Pin
Chris Maunder19-Mar-20 14:07
cofounderChris Maunder19-Mar-20 14:07 
GeneralRe: Anyone here used CUDA? Pin
honey the codewitch19-Mar-20 14:09
mvahoney the codewitch19-Mar-20 14:09 
GeneralRe: Anyone here used CUDA? Pin
Nelek19-Mar-20 12:27
protectorNelek19-Mar-20 12:27 
GeneralRe: Anyone here used CUDA? Pin
mischasan20-Mar-20 6:54
mischasan20-Mar-20 6:54 
AnswerRe: Anyone here used CUDA? Pin
Rick York19-Mar-20 9:53
mveRick York19-Mar-20 9:53 
GeneralRe: Anyone here used CUDA? Pin
Chris Maunder19-Mar-20 9:55
cofounderChris Maunder19-Mar-20 9:55 
AnswerRe: Anyone here used CUDA? Pin
Mark Jerzykowski19-Mar-20 23:07
professionalMark Jerzykowski19-Mar-20 23:07 
AnswerRe: Anyone here used CUDA? Pin
Dean Hawthorne20-Mar-20 2:36
Dean Hawthorne20-Mar-20 2:36 

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.