General Question about GitKraken/Git about comp-econ-sp19 HOT 4 OPEN

Thanks so much! I will look into this.

from comp-econ-sp19.

Good question. The easiest approach would be to save your edited files to some other place so that you can keep your clone of the class repo "clean." This will allow you to pull changes from it without ever having to worry about merge conflicts.

If you're feeling adventurous and want to explore the features of Git, you can commit your personal changes (the process to do this is to stage your changes and then commit them). If you ever encounter merge conflicts---hopefully this will be a rare occurrence---I can help you deal with them. At that point, you might consider using branches to track the divergent histories of your version of the repo and the class version. You can read more about branching here:

• https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell
• https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Note that as long as you have committed your changes, you will always have a backup of what you've done. Creating a commit is like taking a snapshot or backup of all of your files in your repo. If you ever need to, you can always recover your files from the point in time in which any commit was created. (Staging and commiting tells Git to include changed/WIP files in the next commit. Changes not included will not be backed up.)

from comp-econ-sp19.

Thanks for the response!

So I can commit the file, but not push it right? This way I have the backup through Git and it is on my computer, but because I never pushed it won't affect the master repo.

from comp-econ-sp19.

@henryli78 That's right. You won't be able to push to it. jmbejara/comp-econ-sp19 is a remote repo that you don't have "write permission" for.

However, as an FYI, repos can have multiple "remote repos" associated with them. You could create a separate repo on GitHub, add a second remote repo to your local repo (the clone on your laptop), and then you could push to that repo. You would then pull jmbejara/comp-econ-sp19 on a regular basis and then push changes to, e.g., henryli78/comp-econ-sp19. Here's some reference material:

• https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes
• https://www.youtube.com/watch?v=kd4jMl_3LQE

from comp-econ-sp19.