ps

Committed to the wrong branch? -, @{upstream}, and @{-1} to the rescue

By feedproxy.google.com
Published On :: Thu, 27 Feb 2020 00:00:00 -0500

I get into this situation sometimes. Maybe you do too. I merge feature work into a branch used to collect features, and then continue development but on that branch instead of back on the feature branch

git checkout feature
# ... bunch of feature commits ...
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# deploy qa-environment to the QA remote environment
# ... more feature commits ...
# oh. I'm not committing in the feature branch like I should be

and have to move those commits to the feature branch they belong in and take them out of the throwaway accumulator branch

git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

Maybe you prefer

git branch -D qa-environment
git checkout qa-environment

over

git checkout qa-environment
git reset --hard origin/qa-environment

Either way, that works. But it'd be nicer if we didn't have to type or even remember the branches' names and the remote's name. They are what is keeping this from being a context-independent string of commands you run any time this mistake happens. That's what we're going to solve here.

Shorthands for longevity

I like to use all possible natively supported shorthands. There are two broad motivations for that.

  1. Fingers have a limited number of movements in them. Save as many as possible left late in life.
  2. Current research suggests that multitasking has detrimental effects on memory. Development tends to be very heavy on multitasking. Maybe relieving some of the pressure on quick-access short term memory (like knowing all relevant branch names) add up to leave a healthier memory down the line.

First up for our scenario: the - shorthand, which refers to the previously checked out branch. There are a few places we can't use it, but it helps a lot:

Bash 
# USING -

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -        # ????
git push
# hack hack hack
# whoops
git checkout -        # now on feature ???? 
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout - # now on qa-environment ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -        # ????
git checkout -                       # ????
# on feature and ready for more feature commits
Bash 
# ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

We cannot use - when cherry-picking a range

> git cherry-pick origin/-..-
fatal: bad revision 'origin/-..-'

> git cherry-pick origin/qa-environment..-
fatal: bad revision 'origin/qa-environment..-'

and even if we could we'd still have provide the remote's name (here, origin).

That shorthand doesn't apply in the later reset --hard command, and we cannot use it in the branch -D && checkout approach either. branch -D does not support the - shorthand and once the branch is deleted checkout can't reach it with -:

# assuming that branch-a has an upstream origin/branch-a
> git checkout branch-a
> git checkout branch-b
> git checkout -
> git branch -D -
error: branch '-' not found.
> git branch -D branch-a
> git checkout -
error: pathspec '-' did not match any file(s) known to git

So we have to remember the remote's name (we know it's origin because we are devoting memory space to knowing that this isn't one of those times it's something else), the remote tracking branch's name, the local branch's name, and we're typing those all out. No good! Let's figure out some shorthands.

@{-<n>} is hard to say but easy to fall in love with

We can do a little better by using @{-<n>} (you'll also sometimes see it referred to be the older @{-N}). It is a special construct for referring to the nth previously checked out ref.

> git checkout branch-a
> git checkout branch-b
> git rev-parse --abbrev-rev @{-1} # the name of the previously checked out branch
branch-a
> git checkout branch-c
> git rev-parse --abbrev-rev @{-2} # the name of branch checked out before the previously checked out one
branch-a

Back in our scenario, we're on qa-environment, we switch to feature, and then want to refer to qa-environment. That's @{-1}! So instead of

git cherry-pick origin/qa-environment..qa-environment

We can do

git cherry-pick origin/qa-environment..@{-1}

Here's where we are (🎉 marks wins from -, 💥 marks the win from @{-1})

Bash 
# USING - AND @{-1}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -                # ????
git push
# hack hack hack
# whoops
git checkout -                               # ????
git cherry-pick origin/qa-environment..@{-1} # ????
git push
git checkout -                               # ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -                # ????
git checkout -                               # ????
# ready for more feature commits
Bash 
# ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

One down, two to go: we're still relying on memory for the remote's name and the remote branch's name and we're still typing both out in full. Can we replace those with generic shorthands?

@{-1} is the ref itself, not the ref's name, we can't do

> git cherry-pick origin/@{-1}..@{-1}
origin/@{-1}
fatal: ambiguous argument 'origin/@{-1}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

because there is no branch origin/@{-1}. For the same reason, @{-1} does not give us a generalized shorthand for the scenario's later git reset --hard origin/qa-environment command.

But good news!

Do @{u} @{push}

@{upstream} or its shorthand @{u} is the remote branch a that would be pulled from if git pull were run. @{push} is the remote branch that would be pushed to if git push was run.

> git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard origin/branch-a
HEAD is now at <the SHA origin/branch-a is at>

we can

> git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard @{u}                                # <-- So Cool!
HEAD is now at <the SHA origin/branch-a is at>

Tacking either onto a branch name will give that branch's @{upstream} or @{push}. For example

git checkout branch-a@{u}

is the branch branch-a pulls from.

In the common workflow where a branch pulls from and pushes to the same branch, @{upstream} and @{push} will be the same, leaving @{u} as preferable for its terseness. @{push} shines in triangular workflows where you pull from one remote and push to another (see the external links below).

Going back to our scenario, it means short, portable commands with a minimum human memory footprint. (🎉 marks wins from -, 💥 marks the win from @{-1}, 😎 marks the wins from @{u}.)

Bash 
# USING - AND @{-1} AND @{u}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -    # ????
git push
# hack hack hack
# whoops
git checkout -                   # ????
git cherry-pick @{-1}@{u}..@{-1} # ????????
git push
git checkout -                   # ????
git reset --hard @{u}            # ????
git merge --no-ff --no-edit -    # ????
git checkout -                   # ????
# ready for more feature commits
Bash 
# ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

Make the things you repeat the easiest to do

Because these commands are generalized, we can run some series of them once, maybe

git checkout - && git reset --hard @{u} && git checkout -

or

git checkout - && git cherry-pick @{-1}@{u}.. @{-1} && git checkout - && git reset --hard @{u} && git checkout -

and then those will be in the shell history just waiting to be retrieved and run again the next time, whether with CtrlR incremental search or history substring searching bound to the up arrow or however your interactive shell is configured. Or make it an alias, or even better an abbreviation if your interactive shell supports them. Save the body wear and tear, give memory a break, and level up in Git.

And keep going

The GitHub blog has a good primer on triangular workflows and how they can polish your process of contributing to external projects.

The FreeBSD Wiki has a more in-depth article on triangular workflow process (though it doesn't know about @{push} and @{upstream}).

The construct @{-<n>} and the suffixes @{push} and @{upstream} are all part of the gitrevisions spec. Direct links to each:


    Full Article

    • Code
    • Front-end Engineering
    • Back-end Engineering
    ps

    Committed to the wrong branch? -, @{upstream}, and @{-1} to the rescue

    By feedproxy.google.com
    Published On :: Thu, 27 Feb 2020 00:00:00 -0500

    I get into this situation sometimes. Maybe you do too. I merge feature work into a branch used to collect features, and then continue development but on that branch instead of back on the feature branch

    git checkout feature
# ... bunch of feature commits ...
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# deploy qa-environment to the QA remote environment
# ... more feature commits ...
# oh. I'm not committing in the feature branch like I should be

    and have to move those commits to the feature branch they belong in and take them out of the throwaway accumulator branch

    git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

    Maybe you prefer

    git branch -D qa-environment
git checkout qa-environment

    over

    git checkout qa-environment
git reset --hard origin/qa-environment

    Either way, that works. But it'd be nicer if we didn't have to type or even remember the branches' names and the remote's name. They are what is keeping this from being a context-independent string of commands you run any time this mistake happens. That's what we're going to solve here.

    Shorthands for longevity

    I like to use all possible natively supported shorthands. There are two broad motivations for that.

    1. Fingers have a limited number of movements in them. Save as many as possible left late in life.
    2. Current research suggests that multitasking has detrimental effects on memory. Development tends to be very heavy on multitasking. Maybe relieving some of the pressure on quick-access short term memory (like knowing all relevant branch names) add up to leave a healthier memory down the line.

    First up for our scenario: the - shorthand, which refers to the previously checked out branch. There are a few places we can't use it, but it helps a lot:

    Bash 
    # USING -

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -        # ????
git push
# hack hack hack
# whoops
git checkout -        # now on feature ???? 
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout - # now on qa-environment ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -        # ????
git checkout -                       # ????
# on feature and ready for more feature commits
    Bash 
    # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

    We cannot use - when cherry-picking a range

    > git cherry-pick origin/-..-
fatal: bad revision 'origin/-..-'

> git cherry-pick origin/qa-environment..-
fatal: bad revision 'origin/qa-environment..-'

    and even if we could we'd still have provide the remote's name (here, origin).

    That shorthand doesn't apply in the later reset --hard command, and we cannot use it in the branch -D && checkout approach either. branch -D does not support the - shorthand and once the branch is deleted checkout can't reach it with -:

    # assuming that branch-a has an upstream origin/branch-a
> git checkout branch-a
> git checkout branch-b
> git checkout -
> git branch -D -
error: branch '-' not found.
> git branch -D branch-a
> git checkout -
error: pathspec '-' did not match any file(s) known to git

    So we have to remember the remote's name (we know it's origin because we are devoting memory space to knowing that this isn't one of those times it's something else), the remote tracking branch's name, the local branch's name, and we're typing those all out. No good! Let's figure out some shorthands.

    @{-<n>} is hard to say but easy to fall in love with

    We can do a little better by using @{-<n>} (you'll also sometimes see it referred to be the older @{-N}). It is a special construct for referring to the nth previously checked out ref.

    > git checkout branch-a
> git checkout branch-b
> git rev-parse --abbrev-rev @{-1} # the name of the previously checked out branch
branch-a
> git checkout branch-c
> git rev-parse --abbrev-rev @{-2} # the name of branch checked out before the previously checked out one
branch-a

    Back in our scenario, we're on qa-environment, we switch to feature, and then want to refer to qa-environment. That's @{-1}! So instead of

    git cherry-pick origin/qa-environment..qa-environment

    We can do

    git cherry-pick origin/qa-environment..@{-1}

    Here's where we are (🎉 marks wins from -, 💥 marks the win from @{-1})

    Bash 
    # USING - AND @{-1}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -                # ????
git push
# hack hack hack
# whoops
git checkout -                               # ????
git cherry-pick origin/qa-environment..@{-1} # ????
git push
git checkout -                               # ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -                # ????
git checkout -                               # ????
# ready for more feature commits
    Bash 
    # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

    One down, two to go: we're still relying on memory for the remote's name and the remote branch's name and we're still typing both out in full. Can we replace those with generic shorthands?

    @{-1} is the ref itself, not the ref's name, we can't do

    > git cherry-pick origin/@{-1}..@{-1}
origin/@{-1}
fatal: ambiguous argument 'origin/@{-1}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

    because there is no branch origin/@{-1}. For the same reason, @{-1} does not give us a generalized shorthand for the scenario's later git reset --hard origin/qa-environment command.

    But good news!

    Do @{u} @{push}

    @{upstream} or its shorthand @{u} is the remote branch a that would be pulled from if git pull were run. @{push} is the remote branch that would be pushed to if git push was run.

    > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard origin/branch-a
HEAD is now at <the SHA origin/branch-a is at>

    we can

    > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard @{u}                                # <-- So Cool!
HEAD is now at <the SHA origin/branch-a is at>

    Tacking either onto a branch name will give that branch's @{upstream} or @{push}. For example

    git checkout branch-a@{u}

    is the branch branch-a pulls from.

    In the common workflow where a branch pulls from and pushes to the same branch, @{upstream} and @{push} will be the same, leaving @{u} as preferable for its terseness. @{push} shines in triangular workflows where you pull from one remote and push to another (see the external links below).

    Going back to our scenario, it means short, portable commands with a minimum human memory footprint. (🎉 marks wins from -, 💥 marks the win from @{-1}, 😎 marks the wins from @{u}.)

    Bash 
    # USING - AND @{-1} AND @{u}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -    # ????
git push
# hack hack hack
# whoops
git checkout -                   # ????
git cherry-pick @{-1}@{u}..@{-1} # ????????
git push
git checkout -                   # ????
git reset --hard @{u}            # ????
git merge --no-ff --no-edit -    # ????
git checkout -                   # ????
# ready for more feature commits
    Bash 
    # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

    Make the things you repeat the easiest to do

    Because these commands are generalized, we can run some series of them once, maybe

    git checkout - && git reset --hard @{u} && git checkout -

    or

    git checkout - && git cherry-pick @{-1}@{u}.. @{-1} && git checkout - && git reset --hard @{u} && git checkout -

    and then those will be in the shell history just waiting to be retrieved and run again the next time, whether with CtrlR incremental search or history substring searching bound to the up arrow or however your interactive shell is configured. Or make it an alias, or even better an abbreviation if your interactive shell supports them. Save the body wear and tear, give memory a break, and level up in Git.

    And keep going

    The GitHub blog has a good primer on triangular workflows and how they can polish your process of contributing to external projects.

    The FreeBSD Wiki has a more in-depth article on triangular workflow process (though it doesn't know about @{push} and @{upstream}).

    The construct @{-<n>} and the suffixes @{push} and @{upstream} are all part of the gitrevisions spec. Direct links to each:


      Full Article

      • Code
      • Front-end Engineering
      • Back-end Engineering
      ps

      10 Websites and Apps All Designers Should Be Using

      By webdesignledger.com
      Published On :: Thu, 30 Apr 2020 12:53:15 +0000

      As a designer, we’re overloaded with choices every day, but there are some apps that are absolutely worth your time and investment. Finding the best ones and most useful ones can be a difficult task, so we’re going to make things easy for you and give you our top 10 apps and websites we couldn’t […]

      Read More at 10 Websites and Apps All Designers Should Be Using


      Full Article

      ps

      What a trauma and PTSD psychologist tells us about dealing with the coronavirus pandemic

      By feedproxy.google.com
      Published On :: Mon, 13 Apr 2020 10:30:30 EDT

      We’re all experiencing varying levels of trauma.


      Full Article

      ps

      Troops to receive Purple Hearts for injuries during Iranian missile barrage on al-Asad airbase in Iraq

      By feedproxy.google.com
      Published On :: Wed, 29 Apr 2020 13:50:08 EDT

      There will be Purple Hearts awarded to troops injured during the Jan. 8 Iranian missile barrage on the al-Asad airbase in Iraq, a defense official told Military Times.


      Full Article

      ps

      Want to help the USPS and vets? Buy a &#039;Healing PTSD&#039; stamp

      By feedproxy.google.com
      Published On :: Thu, 30 Apr 2020 12:02:25 EDT

      Support two entities with the price of one.


      Full Article

      ps

      Troops to receive Purple Hearts for injuries during Iranian missile barrage on al-Asad airbase in Iraq

      By feedproxy.google.com
      Published On :: Wednesday, April 29, 2020 - 1:50pm

      There will be Purple Hearts awarded to troops injured during the Jan. 8 Iranian missile barrage on the al-Asad airbase in Iraq, a defense official told Military Times.


      Full Article

      ps

      Want to help the USPS and vets? Buy a &#039;Healing PTSD&#039; stamp

      By feedproxy.google.com
      Published On :: Thursday, April 30, 2020 - 12:02pm

      Support two entities with the price of one.


      Full Article

      ps

      5 Important Tips When Building Your First Mobile App

      By feedproxy.google.com
      Published On :: Tue, 07 Apr 2020 07:50:35 +0000

      Building a mobile application is a complex process, and mistake can be costly in time and money. To make sure that your mobile app projects are a success, here are a few tips that will be helpful. 1. Plan Ahead When building anything complex, you should never start without a plan. Building a mobile app […]


      Full Article

      ps

      How to Improve User Experience Design: Tips to Increase Conversion Rates

      By feedproxy.google.com
      Published On :: Fri, 24 Apr 2020 13:53:03 +0000

      No one can deny that UX (user experience) is the foundation of any website. This is the main reason why many website owners always look for ways to improve it. Some even spend a lot of money on design because of it. So, what is UX design exactly? And what is the difference between user […]


      Full Article

      ps

      Tips for Working Remotely and Enjoying It!

      By feedproxy.google.com
      Published On :: Mon, 09 Mar 2020 17:09:10 +0000

      With the coronavirus spreading and employers telling employees work from home if possible, there are scores of people getting their first taste of working remotely. Depending on your experience and discipline levels, this could be a welcomed change or a complete culture shock. The amount of freedom your find yourself in can be similar the […]

      The post Tips for Working Remotely and Enjoying It! appeared first on David Walsh Blog.


      Full Article

      ps

      9 Best Laptops for Photography

      By feedproxy.google.com
      Published On :: Wed, 25 Mar 2020 03:08:31 +0000

      You enjoy photographing in the field, whether its landscapes or events.  When it comes to viewing your captured images, polishing them up and showing to people, you need a laptop to make this possible, especially when you are far from home or office.  But you are not a techie and Cores make your head spin! How do you decide on Continue Reading

      The post 9 Best Laptops for Photography appeared first on Photodoto.


      Full Article

      • Cameras & Equipment
      • laptops for photography
      ps

      Tips on developing creative websites that will wow your clients

      By feedproxy.google.com
      Published On :: Tue, 13 Aug 2019 00:00:42 +0000

      Web designers: we’ve got fabulous news for you. With the global market expanding without limits, clients are more demanding than ever before. They understand that the highly competitive business realm requires creative websites. That’s good news: as competition increases, web development projects become more challenging. That’s good news for Be Theme too as it is […]

      The post Tips on developing creative websites that will wow your clients appeared first on WebAppers.


      Full Article

      ps

      Mobile App Website Inspiration: 20 Application Websites and Tips to Help You Design One

      By feedproxy.google.com
      Published On :: Tue, 10 Dec 2019 00:01:17 +0000

      It may seem a bit curious that more than a few app websites are only given a cursory inspection by app owners. It is given before being largely ignored because visitors have gone elsewhere. The reason for a given website may be completely valid in that it addresses a well-established need. It has a poor […]

      The post Mobile App Website Inspiration: 20 Application Websites and Tips to Help You Design One appeared first on WebAppers.


      Full Article

      ps

      7 Steps to Create Hand-drawn Vector Patterns

      By feedproxy.google.com
      Published On :: Tue, 05 May 2020 14:00:00 +0000

      Get in on the hand-drawn vector illustration trend without leaving the digital realm with this fun and tropical pattern tutorial. Tutorial Details: 7 Steps for Easy Flat Work Hand-Drawn Vector Design Program: Adobe Illustrator CS6 – CC Difficulty: Intermediate Topics Covered: Design Theory, Drawing Skills, Tracing Panel Estimated Completion Time: 15 Minutes Final Image: Hand-drawn Vector […]

      The post 7 Steps to Create Hand-drawn Vector Patterns appeared first on Vectips.


      Full Article

      ps

      Unforgettable Road Trips in the UK-A new of enjoying your next travel

      By feedproxy.google.com
      Published On :: Thu, 04 Feb 2016 17:35:42 +0000

      Scenic Road Trips in the UK that are Worth Capturing by Camera Some people like hiking. Some people like cycling. But, after chatting with online car dealership Carspring, it seems you can have just as much fun exploring your next trip in the complete, climate-controlled comfort of your car. Here we go through the most unforgettable road trips in England, Scotland and Wales. Drives that offer driving heaven, stunning scenery and plenty of fun along the way. All you need is the right company and you are all set to enjoy! England: Road from Glastonbury to Cheddar Gorge – Check out the route here. This route gives you a proper feel of medieval England. Begin deep in England’s spiritual realm on the outskirts of the hallowed town on Glastonbury (Therefore avoid at a certain summer weekend). Start at the Tor on the edge of town, where hippies will tell you ... Read more

      The post Unforgettable Road Trips in the UK-A new of enjoying your next travel appeared first on Digital Photography Tutorials.


      Full Article

      ps

      Tips for Digitizing and Organizing Old Photos

      By feedproxy.google.com
      Published On :: Mon, 02 May 2016 15:42:00 +0000

      Technology continues to transform the world at a mind-numbing pace. Every year it seems, new technologies emerge that put our traditional ways of doing things to shame. Some of these methods are inherently superior, such as the movement toward digital media. While you might not be able to physically feel it in the palms of your hands, having digital media can ensure that you never lose pictures, photos and other forms of media. Most people have old photos laying around that they’d like to ensure last forever, but they haven’t taken the time to digitize and organize them. We’ll review some tips on how to digitize and organize your old photos so that they stand the test of time. Procure a Capture Solution There are a few different ways in which you can begin the process of digitizing your old photos. The first solution is through the use of a ... Read more

      The post Tips for Digitizing and Organizing Old Photos appeared first on Digital Photography Tutorials.


      Full Article

      ps

      3 Tips to Use Perspective in Photos

      By feedproxy.google.com
      Published On :: Thu, 02 Mar 2017 16:27:29 +0000

      Perspective is a powerful tool in photography, and if you’re able to master it you’ll find that you’re able to snap far more interesting photos. It is a common misconception that you need special lenses to experiment with perspective, when in actual fact all you really need to do is move around. If you’re interested in using perspective in your photos, here are 3 easy tips that will help:   Get high, and get low  The easiest way to see perspective in action is by snapping photos from above and below eye-level. Try snapping a photo of a subject from the ground, then again from above it, and see how perspective makes a world of difference in the photos that you end up with. Play around with scale Because objects that are further away look smaller, you can reverse that effect and create some amusing photos. Often this is referred ... Read more

      The post 3 Tips to Use Perspective in Photos appeared first on Digital Photography Tutorials.


      Full Article

      ps

      Master CSS Flexbox in 5 Simple Steps

      By webdesignerwall.com
      Published On :: Thu, 12 Jan 2017 13:00:11 +0000

      CSS flexbox is an incredibly useful tool for layout without using floats or positioning. Currently almost all current browser version support flexbox, making it a go-to standard for web design. It can solve a number of problems efficiently, such as vertical alignment, space distribution, ordering of elements and sizing. It offers more freedom to arrange […]


      The post Master CSS Flexbox in 5 Simple Steps appeared first on Web Designer Wall.


      Full Article

      ps

      Level Up Your CSS Skills With These 20 Pro CSS Tips

      By webdesignerwall.com
      Published On :: Thu, 26 Jan 2017 17:00:41 +0000

      Front-end development is quickly becoming more and more focused on efficiency – faster loading and rendering through selector choice and minimizing code. Pre-processors like Less and SCSS go a long way in doing some of the work for us, but there are plenty of ways to write minimal, quick CSS the native way. This guide […]


      The post Level Up Your CSS Skills With These 20 Pro CSS Tips appeared first on Web Designer Wall.


      Full Article

      ps

      Best Email Marketing Tips to Increase Engagement & Subscribers

      By webdesignerwall.com
      Published On :: Thu, 09 Feb 2017 17:06:31 +0000

      Email is your post powerful marketing channel when used well. Your visitor’s inbox is a perfect opportunity for you to capture attention, communicate important updates and invite readers back to your site for increased visibility. The stats on email marketing effectiveness say it all – top marketing specialists and service providers tell us that email […]


      The post Best Email Marketing Tips to Increase Engagement & Subscribers appeared first on Web Designer Wall.


      Full Article

      ps

      HTC One Review: Top Of The Premium Pops?

      By unlimitedcellphoneplansblog.wordpress.com
      Published On :: Mon, 07 Mar 2016 12:13:07 +0000

      UPDATE: After spending an extensive amount of time with the HTC One we have added our thoughts regarding the handset’s battery life. Click here to find out what we reckon. The HTC One is the latest Android handset from the Taiwanese manufacturer and is aimed firmly at the flagship end of the market, featuring a … Continue reading HTC One Review: Top Of The Premium Pops? →


      Full Article

      ps

      7 Steps to Landing Your First UI/UX Job

      By justcreative.com
      Published On :: Mon, 27 Apr 2020 07:02:04 +0000

      UI/UX design careers are on fire, with plenty of competition for jobs. Here's how to differentiate yourself, save time and succeed in your job search.


      Full Article

      ps

      Photography Tips: How To Create An Amazing Floating Image

      By icanbecreative.com
      Published On :: Tue, 03 Mar 2020 17:21:35 PST

      You can do everything today. There are certainly no limits to what the mind can achieve, and that includes floating. With simply manipulating layers using Photoshop, a floating image has never been...


      Full Article

      ps

      5 Tips That You Absolutely Must Know To Design A Unique Metal Business Card

      By icanbecreative.com
      Published On :: Sat, 04 Apr 2020 04:15:51 PDT

      Every day thousands of business cards exchange hands, and these business cards often get lost in mounds of other cards. Often, clients are unable to reach you just because they couldn't find your...


      Full Article

      • Design Roud-up
      ps

      5 Tips For Doing A Fantastic Graphic Project

      By icanbecreative.com
      Published On :: Fri, 17 Apr 2020 17:00:24 PDT

      You’ve probably had the experience of browsing other people’s graphic projects and wishing you could achieve such effects too. In order to accomplish that, you should expand your knowledge by...


      Full Article

      ps

      Advanced Photography Tips And Hints

      By icanbecreative.com
      Published On :: Sat, 25 Apr 2020 23:54:17 PDT

      It is in every case critical to pay special mind to any computerized photography insights and tips. A few people can truly take awesome photos without truly trying, yet most of us need whatever...


      Full Article

      ps

      Committed to the wrong branch? -, @{upstream}, and @{-1} to the rescue

      By feedproxy.google.com
      Published On :: Thu, 27 Feb 2020 00:00:00 -0500

      I get into this situation sometimes. Maybe you do too. I merge feature work into a branch used to collect features, and then continue development but on that branch instead of back on the feature branch

      git checkout feature
# ... bunch of feature commits ...
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# deploy qa-environment to the QA remote environment
# ... more feature commits ...
# oh. I'm not committing in the feature branch like I should be

      and have to move those commits to the feature branch they belong in and take them out of the throwaway accumulator branch

      git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

      Maybe you prefer

      git branch -D qa-environment
git checkout qa-environment

      over

      git checkout qa-environment
git reset --hard origin/qa-environment

      Either way, that works. But it'd be nicer if we didn't have to type or even remember the branches' names and the remote's name. They are what is keeping this from being a context-independent string of commands you run any time this mistake happens. That's what we're going to solve here.

      Shorthands for longevity

      I like to use all possible natively supported shorthands. There are two broad motivations for that.

      1. Fingers have a limited number of movements in them. Save as many as possible left late in life.
      2. Current research suggests that multitasking has detrimental effects on memory. Development tends to be very heavy on multitasking. Maybe relieving some of the pressure on quick-access short term memory (like knowing all relevant branch names) add up to leave a healthier memory down the line.

      First up for our scenario: the - shorthand, which refers to the previously checked out branch. There are a few places we can't use it, but it helps a lot:

      Bash 
      # USING -

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -        # ????
git push
# hack hack hack
# whoops
git checkout -        # now on feature ???? 
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout - # now on qa-environment ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -        # ????
git checkout -                       # ????
# on feature and ready for more feature commits
      Bash 
      # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

      We cannot use - when cherry-picking a range

      > git cherry-pick origin/-..-
fatal: bad revision 'origin/-..-'

> git cherry-pick origin/qa-environment..-
fatal: bad revision 'origin/qa-environment..-'

      and even if we could we'd still have provide the remote's name (here, origin).

      That shorthand doesn't apply in the later reset --hard command, and we cannot use it in the branch -D && checkout approach either. branch -D does not support the - shorthand and once the branch is deleted checkout can't reach it with -:

      # assuming that branch-a has an upstream origin/branch-a
> git checkout branch-a
> git checkout branch-b
> git checkout -
> git branch -D -
error: branch '-' not found.
> git branch -D branch-a
> git checkout -
error: pathspec '-' did not match any file(s) known to git

      So we have to remember the remote's name (we know it's origin because we are devoting memory space to knowing that this isn't one of those times it's something else), the remote tracking branch's name, the local branch's name, and we're typing those all out. No good! Let's figure out some shorthands.

      @{-<n>} is hard to say but easy to fall in love with

      We can do a little better by using @{-<n>} (you'll also sometimes see it referred to be the older @{-N}). It is a special construct for referring to the nth previously checked out ref.

      > git checkout branch-a
> git checkout branch-b
> git rev-parse --abbrev-rev @{-1} # the name of the previously checked out branch
branch-a
> git checkout branch-c
> git rev-parse --abbrev-rev @{-2} # the name of branch checked out before the previously checked out one
branch-a

      Back in our scenario, we're on qa-environment, we switch to feature, and then want to refer to qa-environment. That's @{-1}! So instead of

      git cherry-pick origin/qa-environment..qa-environment

      We can do

      git cherry-pick origin/qa-environment..@{-1}

      Here's where we are (🎉 marks wins from -, 💥 marks the win from @{-1})

      Bash 
      # USING - AND @{-1}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -                # ????
git push
# hack hack hack
# whoops
git checkout -                               # ????
git cherry-pick origin/qa-environment..@{-1} # ????
git push
git checkout -                               # ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -                # ????
git checkout -                               # ????
# ready for more feature commits
      Bash 
      # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

      One down, two to go: we're still relying on memory for the remote's name and the remote branch's name and we're still typing both out in full. Can we replace those with generic shorthands?

      @{-1} is the ref itself, not the ref's name, we can't do

      > git cherry-pick origin/@{-1}..@{-1}
origin/@{-1}
fatal: ambiguous argument 'origin/@{-1}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

      because there is no branch origin/@{-1}. For the same reason, @{-1} does not give us a generalized shorthand for the scenario's later git reset --hard origin/qa-environment command.

      But good news!

      Do @{u} @{push}

      @{upstream} or its shorthand @{u} is the remote branch a that would be pulled from if git pull were run. @{push} is the remote branch that would be pushed to if git push was run.

      > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard origin/branch-a
HEAD is now at <the SHA origin/branch-a is at>

      we can

      > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard @{u}                                # <-- So Cool!
HEAD is now at <the SHA origin/branch-a is at>

      Tacking either onto a branch name will give that branch's @{upstream} or @{push}. For example

      git checkout branch-a@{u}

      is the branch branch-a pulls from.

      In the common workflow where a branch pulls from and pushes to the same branch, @{upstream} and @{push} will be the same, leaving @{u} as preferable for its terseness. @{push} shines in triangular workflows where you pull from one remote and push to another (see the external links below).

      Going back to our scenario, it means short, portable commands with a minimum human memory footprint. (🎉 marks wins from -, 💥 marks the win from @{-1}, 😎 marks the wins from @{u}.)

      Bash 
      # USING - AND @{-1} AND @{u}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -    # ????
git push
# hack hack hack
# whoops
git checkout -                   # ????
git cherry-pick @{-1}@{u}..@{-1} # ????????
git push
git checkout -                   # ????
git reset --hard @{u}            # ????
git merge --no-ff --no-edit -    # ????
git checkout -                   # ????
# ready for more feature commits
      Bash 
      # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

      Make the things you repeat the easiest to do

      Because these commands are generalized, we can run some series of them once, maybe

      git checkout - && git reset --hard @{u} && git checkout -

      or

      git checkout - && git cherry-pick @{-1}@{u}.. @{-1} && git checkout - && git reset --hard @{u} && git checkout -

      and then those will be in the shell history just waiting to be retrieved and run again the next time, whether with CtrlR incremental search or history substring searching bound to the up arrow or however your interactive shell is configured. Or make it an alias, or even better an abbreviation if your interactive shell supports them. Save the body wear and tear, give memory a break, and level up in Git.

      And keep going

      The GitHub blog has a good primer on triangular workflows and how they can polish your process of contributing to external projects.

      The FreeBSD Wiki has a more in-depth article on triangular workflow process (though it doesn't know about @{push} and @{upstream}).

      The construct @{-<n>} and the suffixes @{push} and @{upstream} are all part of the gitrevisions spec. Direct links to each:


        Full Article

        • Code
        • Front-end Engineering
        • Back-end Engineering
        ps

        New EPA Web Portal Helps Communities Prepare for Climate Change

        By feedproxy.google.com
        Published On :: Thu, 06 Oct 2016 19:18:57 +0000

        By The EPA The U.S. Environmental Protection Agency (EPA) today launched a new online portal that will provide local leaders in the nation’s 40,000 communities with information and tools to increase resilience to climate change. Using a self-guided format, the … Continue reading →


        Full Article

        ps

        Common traps in user needs research and how to avoid them

        By feedproxy.google.com
        Published On :: Mon, 4 Nov 2019 07:31:22 GMT

        Whether you call it a field visit, a contextual inquiry or a customer discovery interview, the goal of early stage research is the same: to uncover users' needs. Here are 5 mistakes I've seen crop up time and again in this kind of research.


        Full Article

        ps

        Maintaining Relationships with Family and Friends After TBI and PTSD

        By feedproxy.google.com
        Published On :: Mon, 30 Dec 2013 00:00:00 EST

        Adam talks frankly about his challenges keeping up with family and friends since his injury; he has good intentions but following through remains difficult.


        Full Article

        ps

        5 Product Image Tips For High Converting Landing Pages

        By dailyblogtips.com
        Published On :: Tue, 21 May 2019 10:50:55 +0000

        They say that a picture is worth a thousand words, but have you ever stopped to think what your Ecommerce images are saying about the products you’re trying to sell online? Are your photos helping your products to jump off the screen and convince shoppers to buy them? Or, are your product images quite simply […]

        Original post: 5 Product Image Tips For High Converting Landing Pages

        The post 5 Product Image Tips For High Converting Landing Pages appeared first on Daily Blog Tips.


        Full Article

        ps

        Every Day A Post of WordPress Tips and Tricks until Christmas!

        By wpengineer.com
        Published On :: Thu, 28 Nov 2013 14:51:16 +0000

        The time has come and our loyal reader know already our traditional Advents Calendar. For the people who don’t know, […]


        Full Article

        ps

        Troops to receive Purple Hearts for injuries during Iranian missile barrage on al-Asad airbase in Iraq

        By feedproxy.google.com
        Published On :: Wednesday, April 29, 2020 - 1:50pm

        There will be Purple Hearts awarded to troops injured during the Jan. 8 Iranian missile barrage on the al-Asad airbase in Iraq, a defense official told Military Times.


        Full Article

        ps

        Want to help the USPS and vets? Buy a &#039;Healing PTSD&#039; stamp

        By feedproxy.google.com
        Published On :: Thursday, April 30, 2020 - 12:02pm

        Support two entities with the price of one.


        Full Article

        ps

        Mobility Pricing Relieves Congestion, Helps People Breathe Easier

        By feedproxy.google.com
        Published On :: Fri, 01 Jun 2018 19:54:22 +0000

        By David Suzuki with contributions from Senior Editor Ian Hanington David Suzuki Foundation By 2002, drivers in London, England, were spending as much as half their commuting time stalled in traffic, contributing to much of the city centre’s dangerous particulate … Continue reading →


        Full Article

        ps

        Committed to the wrong branch? -, @{upstream}, and @{-1} to the rescue

        By feedproxy.google.com
        Published On :: Thu, 27 Feb 2020 00:00:00 -0500

        I get into this situation sometimes. Maybe you do too. I merge feature work into a branch used to collect features, and then continue development but on that branch instead of back on the feature branch

        git checkout feature
# ... bunch of feature commits ...
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# deploy qa-environment to the QA remote environment
# ... more feature commits ...
# oh. I'm not committing in the feature branch like I should be

        and have to move those commits to the feature branch they belong in and take them out of the throwaway accumulator branch

        git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

        Maybe you prefer

        git branch -D qa-environment
git checkout qa-environment

        over

        git checkout qa-environment
git reset --hard origin/qa-environment

        Either way, that works. But it'd be nicer if we didn't have to type or even remember the branches' names and the remote's name. They are what is keeping this from being a context-independent string of commands you run any time this mistake happens. That's what we're going to solve here.

        Shorthands for longevity

        I like to use all possible natively supported shorthands. There are two broad motivations for that.

        1. Fingers have a limited number of movements in them. Save as many as possible left late in life.
        2. Current research suggests that multitasking has detrimental effects on memory. Development tends to be very heavy on multitasking. Maybe relieving some of the pressure on quick-access short term memory (like knowing all relevant branch names) add up to leave a healthier memory down the line.

        First up for our scenario: the - shorthand, which refers to the previously checked out branch. There are a few places we can't use it, but it helps a lot:

        Bash 
        # USING -

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -        # ????
git push
# hack hack hack
# whoops
git checkout -        # now on feature ???? 
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout - # now on qa-environment ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -        # ????
git checkout -                       # ????
# on feature and ready for more feature commits
        Bash 
        # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

        We cannot use - when cherry-picking a range

        > git cherry-pick origin/-..-
fatal: bad revision 'origin/-..-'

> git cherry-pick origin/qa-environment..-
fatal: bad revision 'origin/qa-environment..-'

        and even if we could we'd still have provide the remote's name (here, origin).

        That shorthand doesn't apply in the later reset --hard command, and we cannot use it in the branch -D && checkout approach either. branch -D does not support the - shorthand and once the branch is deleted checkout can't reach it with -:

        # assuming that branch-a has an upstream origin/branch-a
> git checkout branch-a
> git checkout branch-b
> git checkout -
> git branch -D -
error: branch '-' not found.
> git branch -D branch-a
> git checkout -
error: pathspec '-' did not match any file(s) known to git

        So we have to remember the remote's name (we know it's origin because we are devoting memory space to knowing that this isn't one of those times it's something else), the remote tracking branch's name, the local branch's name, and we're typing those all out. No good! Let's figure out some shorthands.

        @{-<n>} is hard to say but easy to fall in love with

        We can do a little better by using @{-<n>} (you'll also sometimes see it referred to be the older @{-N}). It is a special construct for referring to the nth previously checked out ref.

        > git checkout branch-a
> git checkout branch-b
> git rev-parse --abbrev-rev @{-1} # the name of the previously checked out branch
branch-a
> git checkout branch-c
> git rev-parse --abbrev-rev @{-2} # the name of branch checked out before the previously checked out one
branch-a

        Back in our scenario, we're on qa-environment, we switch to feature, and then want to refer to qa-environment. That's @{-1}! So instead of

        git cherry-pick origin/qa-environment..qa-environment

        We can do

        git cherry-pick origin/qa-environment..@{-1}

        Here's where we are (🎉 marks wins from -, 💥 marks the win from @{-1})

        Bash 
        # USING - AND @{-1}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -                # ????
git push
# hack hack hack
# whoops
git checkout -                               # ????
git cherry-pick origin/qa-environment..@{-1} # ????
git push
git checkout -                               # ????
git reset --hard origin/qa-environment
git merge --no-ff --no-edit -                # ????
git checkout -                               # ????
# ready for more feature commits
        Bash 
        # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

        One down, two to go: we're still relying on memory for the remote's name and the remote branch's name and we're still typing both out in full. Can we replace those with generic shorthands?

        @{-1} is the ref itself, not the ref's name, we can't do

        > git cherry-pick origin/@{-1}..@{-1}
origin/@{-1}
fatal: ambiguous argument 'origin/@{-1}': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

        because there is no branch origin/@{-1}. For the same reason, @{-1} does not give us a generalized shorthand for the scenario's later git reset --hard origin/qa-environment command.

        But good news!

        Do @{u} @{push}

        @{upstream} or its shorthand @{u} is the remote branch a that would be pulled from if git pull were run. @{push} is the remote branch that would be pushed to if git push was run.

        > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard origin/branch-a
HEAD is now at <the SHA origin/branch-a is at>

        we can

        > git checkout branch-a
Switched to branch 'branch-a'
Your branch is ahead of 'origin/branch-a' by 3 commits.
  (use "git push" to publish your local commits)
> git reset --hard @{u}                                # <-- So Cool!
HEAD is now at <the SHA origin/branch-a is at>

        Tacking either onto a branch name will give that branch's @{upstream} or @{push}. For example

        git checkout branch-a@{u}

        is the branch branch-a pulls from.

        In the common workflow where a branch pulls from and pushes to the same branch, @{upstream} and @{push} will be the same, leaving @{u} as preferable for its terseness. @{push} shines in triangular workflows where you pull from one remote and push to another (see the external links below).

        Going back to our scenario, it means short, portable commands with a minimum human memory footprint. (🎉 marks wins from -, 💥 marks the win from @{-1}, 😎 marks the wins from @{u}.)

        Bash 
        # USING - AND @{-1} AND @{u}

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit -    # ????
git push
# hack hack hack
# whoops
git checkout -                   # ????
git cherry-pick @{-1}@{u}..@{-1} # ????????
git push
git checkout -                   # ????
git reset --hard @{u}            # ????
git merge --no-ff --no-edit -    # ????
git checkout -                   # ????
# ready for more feature commits
        Bash 
        # ORIGINAL

git checkout feature
# hack hack hack
git push
git checkout qa-environment
git merge --no-ff --no-edit feature
git push
# hack hack hack
# whoops
git checkout feature
git cherry-pick origin/qa-environment..qa-environment
git push
git checkout qa-environment
git reset --hard origin/qa-environment
git merge --no-ff --no-edit feature
git checkout feature
# ready for more feature commits

        Make the things you repeat the easiest to do

        Because these commands are generalized, we can run some series of them once, maybe

        git checkout - && git reset --hard @{u} && git checkout -

        or

        git checkout - && git cherry-pick @{-1}@{u}.. @{-1} && git checkout - && git reset --hard @{u} && git checkout -

        and then those will be in the shell history just waiting to be retrieved and run again the next time, whether with CtrlR incremental search or history substring searching bound to the up arrow or however your interactive shell is configured. Or make it an alias, or even better an abbreviation if your interactive shell supports them. Save the body wear and tear, give memory a break, and level up in Git.

        And keep going

        The GitHub blog has a good primer on triangular workflows and how they can polish your process of contributing to external projects.

        The FreeBSD Wiki has a more in-depth article on triangular workflow process (though it doesn't know about @{push} and @{upstream}).

        The construct @{-<n>} and the suffixes @{push} and @{upstream} are all part of the gitrevisions spec. Direct links to each:


          Full Article

          • Code
          • Front-end Engineering
          • Back-end Engineering
          ps

          Freaky Logo Friday. Logo Mash-Ups

          By feedproxy.google.com
          Published On :: Mon, 01 Jan 2018 13:02:30 +0000

          What would happen if the logos of famous brands suddenly wake up in the bed of another? Thats what the new tumblr blog Logo Mashups explores. It makes us think in the in the connections they share and how they are constantly appealing to our consumer mind through the commons grounds of symbology and typography.


          Full Article

          ps

          Implementing Dark Mode In React Apps Using styled-components

          By feedproxy.google.com
          Published On :: Tue, 28 Apr 2020 10:30:00 +0000

          One of the most commonly requested software features is dark mode (or night mode, as others call it). We see dark mode in the apps that we use every day. From mobile to web apps, dark mode has become vital for companies that want to take care of their users’ eyes. Dark mode is a supplemental feature that displays mostly dark surfaces in the UI. Most major companies (such as YouTube, Twitter, and Netflix) have adopted dark mode in their mobile and web apps.


          Full Article

          ps

          Join Our New Online Workshops On CSS, Accessibility, Performance, And UX

          By feedproxy.google.com
          Published On :: Thu, 30 Apr 2020 12:00:00 +0000

          It has been a month since we launched our first online workshop and, to be honest, we really didn’t know whether people would enjoy them — or if we would enjoy running them. It was an experiment, but one we are so glad we jumped into! I spoke about the experience of taking my workshop online on a recent episode of the Smashing podcast. As a speaker, I had expected it to feel very much like I was presenting into the empty air, with no immediate feedback and expressions to work from.


          Full Article

          ps

          Non-associative Frobenius algebras for simply laced Chevalley groups. (arXiv:2005.02625v1 [math.RA] CROSS LISTED)

          By arxiv.org
          Published On ::

          We provide an explicit construction for a class of commutative, non-associative algebras for each of the simple Chevalley groups of simply laced type. Moreover, we equip these algebras with an associating bilinear form, which turns them into Frobenius algebras. This class includes a 3876-dimensional algebra on which the Chevalley group of type E8 acts by automorphisms. We also prove that these algebras admit the structure of (axial) decomposition algebras.


          Full Article

          ps

          The entropy of holomorphic correspondences: exact computations and rational semigroups. (arXiv:2004.13691v1 [math.DS] CROSS LISTED)

          By arxiv.org
          Published On ::

          We study two notions of topological entropy of correspondences introduced by Friedland and Dinh-Sibony. Upper bounds are known for both. We identify a class of holomorphic correspondences whose entropy in the sense of Dinh-Sibony equals the known upper bound. This provides an exact computation of the entropy for rational semigroups. We also explore a connection between these two notions of entropy.


          Full Article

          ps

          Automorphisms of shift spaces and the Higman--Thomspon groups: the one-sided case. (arXiv:2004.08478v2 [math.GR] UPDATED)

          By arxiv.org
          Published On ::

          Let $1 le r < n$ be integers. We give a proof that the group $mathop{mathrm{Aut}}({X_{n}^{mathbb{N}}, sigma_{n}})$ of automorphisms of the one-sided shift on $n$ letters embeds naturally as a subgroup $mathcal{h}_{n}$ of the outer automorphism group $mathop{mathrm{Out}}(G_{n,r})$ of the Higman-Thompson group $G_{n,r}$. From this, we can represent the elements of $mathop{mathrm{Aut}}({X_{n}^{mathbb{N}}, sigma_{n}})$ by finite state non-initial transducers admitting a very strong synchronizing condition.

          Let $H in mathcal{H}_{n}$ and write $|H|$ for the number of states of the minimal transducer representing $H$. We show that $H$ can be written as a product of at most $|H|$ torsion elements. This result strengthens a similar result of Boyle, Franks and Kitchens, where the decomposition involves more complex torsion elements and also does not support practical extit{a priori} estimates of the length of the resulting product.

          We also give new proofs of some known results about $mathop{mathrm{Aut}}({X_{n}^{mathbb{N}}, sigma_{n}})$.


          Full Article

          ps

          Tori Can't Collapse to an Interval. (arXiv:2004.01505v3 [math.DG] UPDATED)

          By arxiv.org
          Published On ::

          Here we prove that under a lower sectional curvature bound, a sequence of manifolds diffeomorphic to the standard $m$-dimensional torus cannot converge in the Gromov-Hausdorff sense to a closed interval.


          Full Article

          ps

          $5$-rank of ambiguous class groups of quintic Kummer extensions. (arXiv:2003.00761v2 [math.NT] UPDATED)

          By arxiv.org
          Published On ::

          Let $k ,=, mathbb{Q}(sqrt[5]{n},zeta_5)$, where $n$ is a positive integer, $5^{th}$ power-free, whose $5-$class group is isomorphic to $mathbb{Z}/5mathbb{Z} imesmathbb{Z}/5mathbb{Z}$. Let $k_0,=,mathbb{Q}(zeta_5)$ be the cyclotomic field containing a primitive $5^{th}$ root of unity $zeta_5$. Let $C_{k,5}^{(sigma)}$ the group of the ambiguous classes under the action of $Gal(k/k_0)$ = $<sigma>$. The aim of this paper is to determine all integers $n$ such that the group of ambiguous classes $C_{k,5}^{(sigma)}$ has rank $1$ or $2$.


          Full Article