We are having rapid continuous development on a project so the developers repository changes every few days.
I’m unfamiliar with Git and Github
I was originally downloading the repository as a zip and then making some changes locally specific to our needs. Doing a windiff each time to confirm changed files and manually resolving any conflicts with the files that I had changed locally and any new updates from the developer’s repository.
As this was cumbersome I then created a clone of the remote repository locally and if there was a cnflict with the files that I cahnged locally when I did a fetch, I would stash my local files and then manually add my changed lines back in after fetching the remote branch.
I then thought it may be easier to fork the repository make changes to my fork and then merge any changes from the developer automatically by fetching the latest commits form them. I’ve been using a combination of github.com and github desktop for Windows.
However now there is a conflict – I presume with changes I have made to the sam file the developers have now changed.
This branch is 6 commits behind the upstream and has conflicts that must be resolved. Open a pull request to fetch upstream and review changes or resolve conflicts.
However from what I have read this will send my changes back upstream to the developer for them to accept into their repository?
I want to create changes locally and not return them upstream and just merge changes from upstream into my fork and manually deal with conflicts line by line in the file. Currently, and probably incorrectly, I have forked an dhave made local changes in the Master Branch.
What is the best way to achieve this?
Ten-tools.com may not be responsible for the answers or solutions given to any question asked by the users. All Answers or responses are user generated answers and we do not have proof of its validity or correctness. Please vote for the answer that helped you in order to help others find out which is the most helpful answer. Questions labeled as solved may be solved or may not be solved depending on the type of question and the date posted for some posts may be scheduled to be deleted periodically. Do not hesitate to share your response here to help other visitors like you. Thank you, Ten-tools.