Git - pulling new code before pushing existing

I have a a module that i am working on and someone else is working on another module. So in whatever means, there shouldnt be any conflicts between our work.

Is there a way i am missing to overcome this issue? as if i am working on an improvement and someone all of sudden makes a change, is it possible to pull that persons change without impacting on my system?

(new to git)

Answers


This depends on your workflow and also depends on where you and your colleague is working.

First and foremost, if you each are working on your own individual branches, there won't be any conflicts to address until you both merge your branches into master, or some other agreed-upon integration branch.

If you're working in the same branch, then the risk of stepping on each other's toes increases, but can be easily mitigated. Git does a decent job already of avoiding silly collisions, but it will happily inform you when there is the potential of a conflict and it will hand back control to you.

If you run into a merge conflict, you and your colleague need to put your heads together to see what caused it, why, and how to mitigate it. Having tests in your code goes a long way to ensure that behavior isn't missing when the conflict is resolved. This is a personnel thing more than a Git thing, as Git can only do so much in that regard.


Need Your Help

An object reference is required for the non-static field or method or property

c#

I am trying Action<T,T> delegate and got the following error:

backbone.paginator - update per page

javascript jquery backbone.js pagination

I'm using backbone.paginator in my project. I have a dropdown that allows users to select the results per page. Now all I have to do is figure out how to make it work :-)