Repository navigation
Re-running the utility does not update the local files #269
Description
Activity
Existing repos will only have their remotes fetched:
so checkout the remote branch or merge it into the local copy.
git merge origin/mainfor exampleThank you for opening this issue. Just ran into the same problem (?)
Is there a way to either replace
git fetchwithgit pullor run an additional (optional)git mergeafter fetching?I'm using this on a Synology NAS and would like to be able to browse the latest files in the file explorer instead of having to go into the terminal to
git mergemanually.Thanks!
Yes, I do understand. However, how about at least giving the option. In my case, for example, I use the tool for archive purposes only so will not very likely ever run into any conflicts whatsoever.
But as long as my data is still backed up even without the additional
mergeI'm fine with the status quo 😊As mentioned in the readme:
This project is considered feature complete for the primary maintainer @josegonzalez. If you would like a bugfix or enhancement, pull requests are welcome. Feel free to contact the maintainer for consulting estimates if you'd like to sponsor the work instead.
@itdoginfo For clarity, when the script fetches 'remote' branches, the git descriptors can be misleading, because those 'remote' branches are actually available locally. You can checkout a remote branch (which, again, is saved on your local drive at this point) or if you're not concerned with losing anything in your local branches, you can run a simple PowerShell script to loop through all repositories, running
git mergeon each.Also, FYI: https://github.com/earwig/git-repo-updater <- Another python script you can simply run after backup in lieu of PowerShell. You could even add a line to the end of
github-backupthat simply calls this script to achieve the functionality you're requesting.Reacted by paranerd and Harrison Wright@josegonzalez this can be closed as it was addressed by #457
Expected behavior: I run the utility again and the modified files are synchronized.
But the files remain unchanged.
Steps
String after first backup. Main branchMaybe I don't understand something and I need to use some additional flags?