From 4835bff631de0eb56609a57bfa07940a4d1404c2 Mon Sep 17 00:00:00 2001 From: Reto Zingg Date: Sat, 21 Sep 2013 14:00:01 +0300 Subject: [PATCH] add README w/ help for merge/rebase from upstream --- README | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..a266e1d --- /dev/null +++ b/README @@ -0,0 +1,39 @@ +Instructions for merge from upstream: + +.git/config +------------------------------------------------------- +[remote "upstream"] + fetch = +refs/heads/*:refs/remotes/upstream/* + url = git://anongit.kde.org/libkdeedu +------------------------------------------------------- + +1) +get latest upstream: + +git fetch upstream + +2) +create a new branch for querymee based on previous one: + +git checkout -b querymee-kde-4.11 querymee-kde-4.10 + +3) +rebase on new kde release: + +git rebase -i upstream/KDE/4.11 + +4) +in case of a conflict, read: + +cat .git/MERGE_MSG + +5) +solve conflict in file and commit it: + +vi qmvocdocument.cpp +git commit qmvocdocument.cpp +git rebase --continue + +6) +repeat 5) until done... + -- 2.47.3