How to Arc Weld
That what I need!
You should do a video on .gitignore
0:42 why is there so much dust on my laptop screen? nevermind!
Can you create a gui to play chess?
YES!! More git videos please
Yeey another great vid keep it up man!
Most timely video I have encountered in a long time. Thanks a lot 😀
Already knew this, still watched lol
Excuse my obvious britishness here but:
MATE! YOU ARE A FUCKING LEGEND!!
I needed this today sooo baldly!
So do conflicts only occur when you merge more than 1 file to your master. if you always merge one file at a time will it just continuously overwrite the previous lines with the new lines.
Thanks!Could you make an "introduction" in node JS or Electron?Love your stuff <3
I'd love to see how this is done in the command line. Great video! 🙂
I really like your Videos. You subjects I'm interested in, in a really good quality. I would love to see a topic about clean code and code structuring on big projects. Specially on the programming languages c, c++ and python. I this would also fit well in this playlist. Thank you for the videos you make, just keep going like you do. And please forgive my language, but English is not my mother language.
BE CAREFUL with using the Git interface to solve merge conflicts. Sometimes when you Mark the files for resolved, it pushes to the wrong branch!! It is more safe to use the command line and fix it by hand in an Editor 🙂
I have Tried the following it hasn't worked for me:-
I Am USING BRACKETS.
The Code for your Perlin Noise Terrain is giving fill effect in the JS rather than the node(particle effect).
please look in to it as i am not able to get a hang of it.
It maybe because of:-fill(200,200,200, 50);Also can you let me know How to link 'processing' with html file.
I AM USING BRACKETS.
Can you have a coding challenge on android platform???
I never understand the merge option. What if somebody decides to delete some important data structures at the top of the file and another person decides to use that data structure in a function at the bottom of the file? Looks like there's no conflict, but the program just got broken.I consider mergers done automagically to be a dangerous loop hole.
Thank you. Been to lazy to figure out merge conflicts, so seeing this video really helped, especially since I am working on some pretty big projects at the moment.
Would love to see your videos in python too..
Bro your videos are extraordinary Love to. Watch them ???
always have a newline at the bottom of the file
I work on elastix server which based on centos when I install an file this error appeared ( file /var/www/html/help/content from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch file /var/www/html/images/help/extras from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch )
Thank you so much! I was super overwhelmed when I was trying to figure out how to fix merge conflicts. You saved the day!
Can you make a video on how to do this using the git-cli?
More git-cli videos please 🙂
Thanx so much
Could you show a command line way to resolve merge conflicts. And provide some tutorials on rebase, cherry pick, squash
It kind of feels like magic when you move from whiteboard to computer. Maybe you should make a video on your studio setup.
This is for github. Where is the one for git which is on terminal??
whoa its giant ass monitors behind him…
while this was cringe it was also very informative
I am sure this dude is the illegitimate son of Ned Ryerson.
Just awesome explination….
I will just bit the fuxk out of my colleague who delete my code and replace it when conflict.
Your mannerisms are always lovely to watch 🙂 Thanks for the informative video!
Awesome video, educational and entertaining! ?
the funest Trainer
By far the best video on resolving conflicts. I am a master in resolving conflicts….ahem, I mean the GitHub conflicts 😀
Question: I am using github desktop tool and it does not have a feature for merging the pull request. The only option is to use the github online interface which seems clumsy. Does anyone know about a desktop tool where I could see the conflicts side by side and select which one to include?
Is there better explain about github on internet? I don't think so=) keep making your video, it's insane)))
This was super helpful! Thank you very much! I managed to get my conflict solved in just 5 minutes.
Thank you so much! Seems simple but was taking me ages trying to figure this out and needed someone to explain clearly!
But… Okay, to continue your example, let's say that a pull req has changes to lines 2, 3, and 4. But, meanwhile, you've also gone and changed lines 4, 5, and 6 in your master. So a conflict occurs on line 4. You resolve it in favour of the master, ignoring the change to line 4 from the pull req.
Isn't it possible that doing so will break some piece of functionality or some dependency in the pull req?
your videos are really helpful and easy to understand.thanks!
Nice video. V helpful for beginners like me. I did all using command line after watching this GUI mode 🙂
P.S: This doesn't work for Unreal projects
THANK YOU SO MUCH
what to do if the conflicts are too complex?
Great to learn with you. It's fun. Courage.
Thanks for your videos Could you please make a video for stash
But the thins is GIT raises conflict even if a file was changed in different lines before the merge…
I think you have wrongly resolved the first conflict. The code maybe in use, but you removed.
So how does it know when files are conflicted? what i mean is this: if let's say someone changes line 5 in a file and pushes it. Then someone elkse pushes a change in line 5 too about 5 minutes later.. Why does it not just overwrite it like it would have in a normal situation? does github keep track of what file versions are where at any given time? Like:
Person A pulls file X from master.Person B pulls file X from master aswell.
then person A changes line 5 and pushes it (nothing happens and everything is fine)
Github sees that there is an update to file X so it changes the files version.
then person B pushes his changes on line 5 and there is a conflict because this person still has the older version of file X. This woudnt have been a problem if he changed other lines than line 5(which weren't changed in all the file X versions since his last pull).
Than someone must decide what change to go with and mark as resolved.
So to summerize:
Github keeps track of versions in the background, everytime someone makes a commit the version number changes (calling it version number for simplicity sake)
if you are working on a older file version than in the master you can only upload changes to lines were no change has been made in updates between your version number and the most recent one on the master.
If you do it gets conflicted and needs to be resolved.
i am trying to understand and im just explaining how i see it now,. Please correct me if im wrong.
Thank you 🙂
Your email address will not be published. Required fields are marked *
Save my name, email, and website in this browser for the next time I comment.