git - Gihub Pages: How to merge between two (forked) repositories? -


i have website (example.org) hosted on github pages. content in master branch of "production" repository of "example" organization.

  • example/production:master
  • => git example.org

i have fork of repository in personal account repository "staging" create content (in branch master feature branches) , prepare publication. published on github pages (as personal.github.io/example.org)

  • personal/example.org:master
  • (fork of example/production:master)
  • => personal.github.io/example.org

this bit complicated setup required repository can have 1 branch published on github pages under 1 url. publicly available url work-in-progress, need have fork on personal account.

in order works, have delete cname file in fork (otherwise tries publish same domain, doesn't work in use) , change same values in _config.yml file jekyll (so internal navigation on site works, tracking codes).

(i can't put these file .gitignore because wouldn't in repository, used github pages directly...)

when try create pull request on "production" changes "staging" these changes cname , _config.yml merged - breaking example.org in process.

so right cherry picking individual commits "staging" "production" - real pain.

is there way keep 1 commit have on "staging" out of merge?

the solution above question has 2 steps:

  1. change domain of fork personal.github.io/example.org staging.example.org cname file doesn't have delete has have different content, staging.example.org.

  2. to able have different files in both repos while still think merged, have following:

    assume have our production repo , staging repo both checked out locally, being identical (and having same cname , _config.yml). check out staging, make changes files , commit , push them.

    if normal merge production, change merged over.

    but run these commands:

    git checkout production git merge --strategy=ours staging git push production production:master

    (source)

    --strategy=ours makes sure during merge, production file remain unchanged. commit still marked merged.

    if want, can edit commit message between step 2 , 3 bit more descriptive did: merged 2 branches, made keep "our" (in case: production) version of files.

so git files merged, although kept content. long don't touch them again, these files stay different count "merged".


Comments

Post a Comment

Popular posts from this blog

neo4j - finding mutual friends in a cypher statement starting with three or more persons -

Image
i trying build cypher statement neo4j know 2-n starting nodes name , need find node (if any) can reached of starting nodes. at first tought similar "mutual friend" situation handled (start1)-[*..2]->(main)<-[*..2]-(start2) in case have more 2 starting points around 6 know name. so puzzled how can include third, fourth , on node cypher able find commmon root amongst them. in above example neo4j website need path starting 'dilshad', 'becky' , 'cesar' check if have common friend (anders) excluding 'filipa' , 'emil' not friends of three. so far create statement programmatically looks like match (start1 {name:'person1'}), (start2 {name:'person2'}), (start3 {name: 'person3'}), (main) (start1)-[*..2]->(main) , (start2)-[*..2]->(main) , (start3)-[*..2]->(main) return distinct main but wondering if there more elegant / efficient way in cypher possibly use list of names parameter ...
Read more

php - How to remove letter in front of the word laravel -

Image
based on picture above result of var_dump() , dd() of same variable ,when var_dump() , apostrophe (') symbol in black diamond of question mark , when dd() same variable , apostrophe can seen letter 'b' appear in front of words what want can me result : loreal's sdn bhd and @ same time want remove special character ( excluding these 4 symbols (-) ,(_) ,('),(,) ) simply escape special character resolve issue. mysqli_real_escape_string resolve issue. $name = mysqli_real_escape_string($request()->user); or use addslashes function() $name = addslashes($request()->user);
Read more

minify - Minimizing css files -

i want know how css files can minimized. currently, using external sites css minifier compress css files. however, after removing whitespaces, comments, etc, file sizes reduced 10-15%. how frameworks bootstrap manage make minimized versions kilobytes. as example, css is: body { background-color: #ff0; } the reduction goes 28 bytes 22 bytes other css files have lot more characters still smaller this. actually minifying code means it's remove thing code white space characters new line characters comments block delimiters it reduces amount of code has transferred on web , speed site load fastly.but unreadable format.
Read more