we are using GIT repositories as integration tool for the source control.
but whenever 2 or more people are pushing the changes to the repository we are getting conflicts can you please help with it.
we tried the following solutions :
- git bash : using stash and they pulling the latest code and applying our stash.
- deleting the code first few times as the coding part was less.
- ignoring our local changes and pulling the latest ones.
the tool doesn’t support the inbuilt feature for stashing & conflict resolution.
can you please let us know how to stash the local changes