Editing a file that has already been modified by another SI programmer

[Kyle Johnson]

As we continue to edit the files that the student workers are currently working on I have ran into a slight issue. 

CJ and I have been keeping a log of the files we edit so we will know if we are stepping on each other's toes (so to speak) while making changes in the same directories.

We haven't had to be in the same file until just now in regards to the changes that he made on 05/29/19 to the BuildList.mpws file.

(The path to this file is: mathpiperide/src/library_apps/mathpiper4/src/org/mathpiper/scripts4/lists/BuildList.mpws)

I am curious how I can obtain the changes that were made by CJ (in this case to BuildList.mpws) as I don't want a merge conflict and I don't want to overwrite his changes either, as we will be editing different things in the file.

Any help that anybody can give to me is always appreciated!

Thanks,

Kyle

[Ted Kosan]

Kyle,

The following explain how to update/sync a fork with the master repository:

https://confluence.atlassian.com/bitbucket/forking-a-repository-221449527.html

https://stackoverflow.com/questions/9944898/bitbucket-update-a-fork-to-merge-changes-of-master-repo

After updating/syncing, when you do a "git pull", you still might
encounter one or more conflicts that need to be resolved.

Ted

> --
> You received this message because you are subscribed to the Google Groups "mathpiper-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to mathpiper-de...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/mathpiper-dev/05f4de31-c191-41f0-8b11-70d8f7c87cef%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.