summaryrefslogtreecommitdiff
path: root/docs/Syncing-your-fork.md
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2019-02-17 21:34:28 +0100
committerYehonal <yehonal.azeroth@gmail.com>2019-02-17 21:34:28 +0100
commita3d359e1cc4f40328f898653a5cc3b9711a522e6 (patch)
tree48d879cbdbf5e78a72ca686912ca4ac361c929c7 /docs/Syncing-your-fork.md
parentb781501462339649eac45d9d54f8dbbfb11a32db (diff)
downloadwiki-a3d359e1cc4f40328f898653a5cc3b9711a522e6.tar.gz
wiki-a3d359e1cc4f40328f898653a5cc3b9711a522e6.tar.bz2
wiki-a3d359e1cc4f40328f898653a5cc3b9711a522e6.zip
Import all wiki page from old wiki (links to fix)
Diffstat (limited to 'docs/Syncing-your-fork.md')
-rw-r--r--docs/Syncing-your-fork.md21
1 files changed, 21 insertions, 0 deletions
diff --git a/docs/Syncing-your-fork.md b/docs/Syncing-your-fork.md
new file mode 100644
index 0000000..c15bdc1
--- /dev/null
+++ b/docs/Syncing-your-fork.md
@@ -0,0 +1,21 @@
+Syncing your fork is always a good idea when you create a Pull Request.
+
+# How to sync your AzerothCore fork
+
+Open your terminal and move to the local clone of your AzerothCore fork.
+
+Switch to your _master_ branch (or whatever branch you need to sync):
+
+`git checkout master`
+
+Then type:
+
+`git remote add upstream https://github.com/azerothcore/azerothcore-wotlk.git`
+
+`git fetch upstream`
+
+`git merge upstream/master`
+
+Then when you are ready to push the changes (e.g. after resolving merge conflicts, if any):
+
+`git push` \ No newline at end of file