Skip to content

Latest commit

 

History

History
25 lines (20 loc) · 858 Bytes

General.md

File metadata and controls

25 lines (20 loc) · 858 Bytes

General

These are some general notes and useful information about programming or other related topics.

Repositories

GitHub

Creating a Repository

Merging Two Existing Repositories

Merging GitHub Repos whilst maintaining histories is a bit of a pain. The following steps should help you to do this.

  1. Create/Locate the Repo that you want to Merge into.
  2. cd into the Repo
  3. git remote add -f
  4. git merge /master --allow-unrelated-histories
  5. git remote remove
  6. git commit -m "Merged Repo"

You may need to fix some conflicts, but this should be minimal. (Opening in VSCode is the easiest way to sort this)

Example

cd /Users/caddickbrown/Documents/Projects/General git remote add -f SApps https://github.com/Caddickbrown/SApps.git git merge SAppTemplate/master --allow-unrelated-histories